Andrew's git / gitweb.git / t/t4135/diff-with tab.diff
?
t / t4135 / diff-with tab.diffon commit merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir (86273e5)
   1--- post        image.txt.orig  2010-08-18 20:13:31.616002255 -0500
   2+++ post        image.txt       2010-08-18 20:13:31.616002255 -0500
   3@@ -1 +1 @@
   4-preimage
   5+postimage